merge with xen-unstable.hg
authorawilliam@xenbuild.aw <awilliam@xenbuild.aw>
Tue, 28 Mar 2006 15:54:58 +0000 (08:54 -0700)
committerawilliam@xenbuild.aw <awilliam@xenbuild.aw>
Tue, 28 Mar 2006 15:54:58 +0000 (08:54 -0700)
commitaba2f778df89a5badc722620f2376b26f6eafe77
treefac60f56d09d4c22698fc42a27060b977c4e4871
parentb6d283bdcb7f72167b94ce4e12c6b010a52ee65e
parentee35c5fbf6f44dd7fd56a15f9af36a4f19c10cd1
merge with xen-unstable.hg